From 96b9b215fa92acdec64e922cb3059f88ad6bc0d0 Mon Sep 17 00:00:00 2001
From: "tsteven4@gmail.com"
 <tsteven4@gmail.com@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sun, 5 Jan 2014 23:16:21 +0000
Subject: [PATCH] leak fix and cleanup for gdb.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4713 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/gdb.cc   | 32 ++++++++------------------------
 gpsbabel/test-all |  4 ++--
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index af9cf1a24..32f227b1a 100644
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -1849,26 +1849,18 @@ static void
 write_route_cb(const route_head* rte)
 {
   gbfile* fsave;
-  char buf[32];
 
   if (ELEMENTS(rte) <= 0) {
     return;
   }
 
-  String tname;
-  if (rte->rte_name == NULL) {
-    snprintf(buf, sizeof(buf), "Route%04d", rte->rte_num);
-    tname = mkshort(short_h, buf);
+  QString name;
+  if (rte->rte_name.isNull()) {
+    name = mkshort(short_h, QString().sprintf("Route%04d", rte->rte_num));
   } else {
-    tname = mkshort(short_h, rte->rte_name);
+    name = mkshort(short_h, rte->rte_name);
   }
 
-  QString name(tname);
-#if NEW_STRINGS
-#else
-  xfree(tname);
-#endif
-
   rte_ct++;	/* increase informational number of written routes */
 
   fsave = fout;
@@ -1881,26 +1873,18 @@ static void
 write_track_cb(const route_head* trk)
 {
   gbfile* fsave;
-  char buf[32];
 
   if (ELEMENTS(trk) <= 0) {
     return;
   }
 
-  String tname; 
-  if (trk->rte_name == NULL) {
-    snprintf(buf, sizeof(buf), "Track%04d", trk->rte_num);
-    tname = mkshort(short_h, buf);
+  QString name; 
+  if (trk->rte_name.isNull()) {
+    name = mkshort(short_h, QString().sprintf("Track%04d", trk->rte_num));
   } else {
-    tname = mkshort(short_h, trk->rte_name);
+    name = mkshort(short_h, trk->rte_name);
   }
 
-  QString name(tname);
-#if NEW_STRINGS
-#else
-  xfree(tname);
-#endif
-
   trk_ct++;	/* increase informational number of written tracks */
 
   fsave = fout;
diff --git a/gpsbabel/test-all b/gpsbabel/test-all
index 298c5de3f..18ac264fb 100755
--- a/gpsbabel/test-all
+++ b/gpsbabel/test-all
@@ -55,9 +55,9 @@ function try_run() # command line
     local RES=0
     local SEVERITY=""
     
-    [ $vg -ne 0 ] && CMD="valgrind -q $CMD"
+    [ $vg -ne 0 ] && CMD="valgrind --error-exitcode=125 --leak-check=full --show-reachable=yes --suppressions=gpsbabel.supp --log-fd=3 $CMD"
 
-    ${CMD} > $TEMPDIR/.result 2>&1
+    ${CMD} > $TEMPDIR/.result 2>&1 3>>vg.log
     RES=$?
     if [ $RES -ne 0 -o -s $TEMPDIR/.result ]; then
         if [ $RES -ne 0 ]; then
-- 
2.30.2